gtk_label_get_label() should be used instead of gtk_label_get_text().

2008-03-22  Björn Lindqvist  <bjourne@gmail.com>

	* gtk/gtkexpander.c (gtk_expander_get_label):
	gtk_label_get_label() should be used instead of
	gtk_label_get_text(). (#353088, Xan Lopez)

svn path=/trunk/; revision=19920

diff --git a/ChangeLog b/ChangeLog
index 8c1bf5b2ffe517f607a816ff2cce16513b20b6db..03ee29939d2df2ecf1ea954e729eeb158a85cf27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-22  Björn Lindqvist  <bjourne@gmail.com>
+
+       * gtk/gtkexpander.c (gtk_expander_get_label):
+       gtk_label_get_label() should be used instead of
+       gtk_label_get_text(). (#353088, Xan Lopez)
+
 2008-03-21  Tor Lillqvist  <tml@novell.com>
 
        Import the GDI+ gdk-pixbuf loaders for Windows by Dominic

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 3172fdb24fd753f202207c6c60cfa4de65a272bb..cb8e53f0f338bdee358fdd6b4f4b29c031d8b555 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -1532,11 +1532,11 @@ gtk_expander_set_label (GtkExpander *expander,
  * gtk_expander_get_label:
  * @expander: a #GtkExpander
  *
- * Fetches the text from the label of the expander, as set by
- * gtk_expander_set_label(). If the label text has not
- * been set the return value will be %NULL. This will be the
- * case if you create an empty button with gtk_button_new() to
- * use as a container.
+ * Fetches the text from a label widget including any embedded
+ * underlines indicating mnemonics and Pango markup, as set by
+ * gtk_expander_set_label(). If the label text has not been set the
+ * return value will be %NULL. This will be the case if you create an
+ * empty button with gtk_button_new() to use as a container.
  *
  * Return value: The text of the label widget. This string is owned
  * by the widget and must not be modified or freed.
@@ -1553,7 +1553,7 @@ gtk_expander_get_label (GtkExpander *expander)
   priv = expander->priv;
 
   if (GTK_IS_LABEL (priv->label_widget))
-    return gtk_label_get_text (GTK_LABEL (priv->label_widget));
+    return gtk_label_get_label (GTK_LABEL (priv->label_widget));
   else
     return NULL;
 }